Pimping toolkit-ui repo. Fixes issue #52