(Nikita) Refactoring / UI of Home page