Restructured markup, added some styling