URBNG-448: Removed some unnecessary code and changed view.