Changed inputs to span elements
Clean up code