Updated Database and several layouts