simplified things
further simplified things
Merge branch 'hide_errors_button_simplified' into develop