More restructuring for a new tile layout.