Stephen - fix settings window