Improve user blocks