UI work, start to handle settings better