Some more layout changes to the raw template to try to make it fits in a little more