code update for basic layout screens