New DataStore UI fixes and tweaks