Rebuild layout to make it more semantic
Add navigation module and it's models and collections