lots of work on the mixing UI and components