Clean up layouts, fix remaining bugs.