Layout updates to make better use of _includes, CSS tweaks