Made some UI changes, refactored some views.