Few more homepage UI refactoring