Adding Toggles and Proper Formating