Tweaked two features with the View to make it prettier / less error-prone.