Error Controller and back button improvements