#33 - made UI nicer and cleaner