Move sidebar / fix indents
Clean up how buttons are defined
Add new functions for buttons