added height to spans. Refactored naming'