Finish layout and routes
Merge branch 'release/v0.5.0'