Fixing variable conflicts
Fixing line-height