New database structure, modified UI