Fixing focus and tab issue on homepage and adding account page
merging