Started working on cleaning up the view code.