Working on ui, note composition improvements
Misc improvements