Miscanaellous fixes to improve menus