Added JSF syntax, navigation