major database modification + some UI