Home Page - Fixes