Fancy skillbox and some restructuring