A few minor additions
Fixed mere conflicts on the user page