Bug fixes and skin

Bug fixes and skin