adding support for turning -layout parameter on and off through options