Made quite a few changes to the View layout after testing it in a client