refactored out the view and renamed some labels