adding styling code
Merge branch 'styling'