Moved stuff around, style tweaks