Added Cancel Buttons, more functionality of main screen