Fixed bugs, reverted some code changes for toolbar inclusion