Redesign

Stopped messing around with the code. Adding effects to items soon.