updated deps
Using services, better mock data, flattened menu one level