AOSCP layout changes