Manage Data UI fixes