Move user display code into user module #126

Move user display code into user module #126