Move some logic out of the views into the helpers
Add images to status messages