Updated current jsf forms and added new