Some refactoring  and some changes on Home page
Some refactoring  and some changes on Home page