changing menu
some stuff
added segmented controls for settings
trying merge again