Layout Tweaks for initial azure deployment.