Added new buttons and screens