Layout fix for WWW-1536