Fix fluid colum layout

Includes various small tweaks to templates and css, feel free to evaluate.
fixes #635