update user interface
Merge branch 'gutschick'