Updated methods to work correctly for new tools, updated button styling, updated layout, cleaned up classes and other things.