CSS & variable name fixes