cleaning up some stuff, setup for tabbed interface
naming