updated layout
updated db manager
merge changes