Added features to the settings window + other minor changes