Adding variables and reorganising CSS