Fixed some issues with the home screen menu