fix style See merge request !91
Feature/0530 See merge request !89
page animate See merge request !88