bugfix and polish ui