Waiter scripts, changes in logic

Changes in database logic, waiter UI related scripts