Improve user module templates