Cleaned up menu a little