Moved a couple items, too tired to code and not screw up