refactor clean up btn code, fix if stmt for Add Event btn