Merged JSF UI back in.