Added settings window. Small changes