Added button modes (WIP)