index styling
Merge branch 'styling' into development