Updated the view structure from AEWA