ui update and bugfix