Updated skin, code cleanup