Made the 'view' a bit more user friendly