Adding changes from sweyn to peoplepage