UI bug fixes
Merge branch 'master' of https://github.com/mox1990/Project-Postdoc
The complete demo data for 26/09/2014