Updated DB Layout & DB Menus