Improved styles

Just to see what is possible/needed, only really noticeable on test skin