Assorted Additions And Bug Fixes

Adding buttons that we won't have time to add stuff too and fixing bugs