#281 - finishing touches like ui and ux improvements