fix indent and tag structure
clean-up css and right pain