Missed some tags to conform to new CSS