minor formatting and menu fixes