Master: Fix Settings Page