A few small things, mostly layout tweaks