Some progress with layout styling