Make settings window, bug fixes