Fixed a few bugs with signs, and added a toggle for the sidebar
Fixed the merge