Updated the Skin and Container

Many small updates including compatibility for sub folders, and bug
fixes.