Usability improvements

(Demo updated)