builder UI improvements/removed db