Rearrange skills, remove un-used CSS classes