Added some new buttons and changed menu layout