Fixed code errors

Fixed some code errors that werer causing the home page to display
incorrectly on gold app.
Merge branch 'working-branch'