UI improvements & better sample