Improve configuration, persist clicked tabs