Hotfix and little ui improvement