ui stuff

ui stuff
Merge remote-tracking branch 'marvin/master'