CMS-1077 All apps - Improvements to wizard layout

Fixing broken navigation toolbar