include option button/clear error msg/remove error handling