[UPDATE] baselayout: Update for A4