WIP. UI changes, tests for restaurant model only