Further improvements to user tutorial/basic admin