many modifications in the UI