Skinning v2 - Additional fixes

@aboudreault Can you have a look to see if you spot anything wrong? Should be minor styling fixes without consequences, but good for you to have a look.