bugfixes, cleanup
Rearrange menus to be more standardized/consistent.