merge styling fixes from joonas