Fixed error in menu and renamed entry
Fixed some typo's in entities and made a test with templates