Refactored view, added some styling, resolved #1