Optimized UI.
Merge pull request #124 from chemiker/master

Optimized UI