Remove extraneous file reference from base template.
Some more layout fixes.