A few renames, horizontal/vertical is uneccesary. Added legend