Improve manage page