More standardization... need to add simple menu item for settings