UI rescale & stuff
Merge remote-tracking branch 'bathtub/master'