merging master and ui-improvements from upstream

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