Did some more messing around with layout