merged ui-improvements (8c3e92f) to master

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>