UI stuff
Merge pull request #22 from aberke/alex

UI stuff