Updated: comments, navigation links, main includable