refactoring toolbar and tabs
new controls, lists giving me a headache