Fixed Freemarker error and added navigation menu