Refactored the view to be super aweseome