Added Cancel and Done functionality to the ConfigurationScreen