Added details and styling
Merge branch 'dev'