Minor layout classname changes. Also cleaned up accessibility link markup.