Small fix and update view
More view improvements and setting sensible back links