Removed debugging drop down menu; Refactored a bunch