Added more old layout bits, less-ified the less