committing before merging local stash
initial mod for menu resizing, some more angularization/splitting of the controllers