fixed contents, added more contents, added contents highlighting