basic stylig
Merge branch 'styling'