Tests and ui tweaks
Merge pull request #15 from twokul/ui-tweaks-test

Tests and ui tweaks