Updated layout.
Clean up.