major cleanup, add settings menu
major cleanup, adding settings menu