Main Stylesheet minor reorg