Finished toolbar revision, still need to refactor rangy stuff and saving/loading...