Final changes to view - app still very much in progress