Added code to make the view nicer