OMG more style and html structure changes