Updated Setting page with a better UI