final tweaks to post layout cleaning up code