Additional changes to alpha layout