Layout Refactor, Database Modal