Fixed CMSDashboard and Settings Switchboard