Fixing ui stuff
Merge branch 'test' of http://github.com/thomas4g/2340 into test