updated styling and db after merge