toolbar button fix, renamed modules, misc.
css needs more work
minor changes before pre-release