Moves the bottom toolbar functionality in the UI and fixes some errors