Full DB + UI fixes overall