#141 UI bugfix