Layout code revisions for Outift