Add 'vertical-align'

+ use 'match' instead of 'if'