GUI Update

update all the views and style sheets
Merge branch 'master'