Some layout changes to user.xhtml