minor gui edits
Merge branch 'qt4' of https://github.com/anselg/Membrane-Test into devel
Merge branches 'devel' and 'qt4' into qt4