various UI changes
merge commit -- please please dont mess everything up