Added GAI to more screens