A few small things, mostly loayout tweaks