Merge branch 'development' into dashboard
fixed linked in button link
created page layout for 'show'
Merge branch 'dashboard' into front-end
Merge branch 'front-end' into development