refs 6842 modified layout