Organized User Settings and made small bug fixes