Finishing First DB Version
Starting with the master layout