Shop Changes + Additional Classes

Still some issues with shop scrolling, should be resolved tomorrow.