SOme more style updates.
Move things around a little bit.