moved skill class and ui updates