Final fix for the evening. Cleaned up the menu a bit.