clean up and fixing cancel button in hidden forms