Revert "Organized User Settings and made small bug fixes"

This reverts commit f984896b732af9a21a2dae4dc341c3ae347c75a1.
Fixing shit
committing ignore