Change form order in settings window
Few fixes