UX polished a bit :-)