Updated views

Need to redo table system but in the interim this will do.