Bit better on the layout, still broken