[WebAdmin] Code improvements.