Refactored some views, added more CSS