Refs #2: Layout makes slightly more sense now.