+ implemented changes according to the 1 user feedback for usersites.