Add new segments and change default layout

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>