Some work on settings and various gui changes