Buttons & Other MISC fixes