Reimplement mark up and css