Base working group plus various fixes to the UI