Implemented Cancel button, removed Apply button