Fixing some layout issues. Added some breakouts.