Layout updates and extensions. Found a problem I need closures for. Yay! [skip ci]