agronick Merge pull request #7 from zenima/ui-improvements