settings persisting, ui reorganized