More improvements to Manage Tab