UI changes
Merge pull request #21 from aberke/alex

UI changes