Few tweaks, adjusted orientations