more consolidation, subwired css fixes