Restaurant activity + views
Merge frederic with thomas
Refactored design pattern + grable path updates to allow sub folding in layouts