improved UI, better samples