Add organization name to login screen and Add a cancel button to login.xhtml