The toolbar remebers the last configuration + Small UI cleanups