Updated auto-layout