Settings and Dashbaord fixed