baselayout: Update for Alpha 2