[bugfix] Broke a few things while merging clochix's work
[style] fix alignment of buttons in compose
[misc] code clean