Organize menu a bit