Updated the layouts.  tried to more closely match the psd.