Options menu changes

- Options menu will use state.pop() to exit
- Apply button properly moves buttons
- Esc key to exit options removed since back button was added