Add styling and better semantics