Made some layout changes and added the links to the respective a tag