Cleanup of layout