Minor reorganization on layout.