Fixed user cancellation. Refactored a bit of html. Still need to work on clickable rows