Settings Page fixes