Detect more generating functions.
Added a narrow layout.