Changes to theme + minor bug fixes in update user routine