Fix column highlighting
Consistent command usage