Fixed issues with Home page