Improved messages
More cleanup of location view
Added extra render on failure