Misc button(Mode) fixes and optimizations