ec78b76 fiddling with layout