Mostly finished the view portions of the app