Adding style and some more structure to the markup