Merge fix from quickfingerz

cleaned up GUI skin code, fixed certain UI issues.