ui redesign
Merge pull request #2 from nicosteiner/master

ui redesign