Added navigation links, modified URL Mappings and added comments