Fixed nav in basic and narrow layouts
Updated ControlGroupExtensions
Merge pull request #49 from chrisfraser/master

Fixed nav in basic and narrow layouts