Issue 16 - slightly better UI