Refined the menu a bit