Minor layout changes to composergrid
Resolved conflicts, updated TODO