Improve/add/remove markup

git-svn-id: https://plugins.svn.wordpress.org/genesis-agent-profiles/trunk@902870 b8457f37-d9ea-0310-8a92-e5e31aec5664