Reorg and tweak styles and markup