Move Who is using to a seperated section (#921)