Updated masterpage and user class