Previous commits styleheet update fixes