Separated out main styles; reworked counter updates