Layout tweaks and fixes
additional strong parameters.