Change Uri to adminUrl in User and Theme modules, and bug fixes