Re-arranging views

getting rid of views that aren't required. Chaning the way the
application looks and handles data.