fixed merge issue
Merge pull request #213 from theodi/ui-tweaks

fixed merge issue