Skin updates, misc tweaks