Last changes for the night

Tomorrow I hit the CSS. Stupid non dynamic layout has to go.