tweaking things in compose view + JS + CSS styling
Fixing merge- I think i was working on compose JS stuff
Fixing compose merge conflict