Fixes and Home page