Added some markup and structure