More polished UI. Added some unit tests on business logic class