Fixed junk off by one error and other things

-Refactored naming
-Render items in correct order (skeletons can no longer hide)