UX improvements 2

Lasek remarks implemented.