Cleaned up the menu a bit.