ui improvement + bugfix