Debugged styling
Merge branch 'stylingdebug'