stylesheet reorganization and small update