Move user display code into user module #126