changed UI and several minor changes