More fixes to AO. Add some UI.