Just a bunch of changes to the view class

Started on a basic ui, also
Merge remote-tracking branch 'origin/master'

Conflicts:
	model_classes.php