Simplify and fix layout.