Fix layout issue for classical theme