ux/ui redesign - cheatsheets and new snippets
Merge branch 'routing'
resolve merge conflict