Add 'Unpin' to column menu
Header size calculating closer to correctly