Horrible and naive crap, extended.
Merge remote-tracking branch 'rev/master'
ui stuff

ui stuff