Submit/Cancel button work around before we get deeper into delegates