Gui updated.
Merge remote-tracking branch 'origin/master'
Continued view refactoring.