More css and markup/template fixes