[UPDATE] baselayout: Update for alpha3