Bug Fix for Menu Screen, etc.