Properly highlight stage, remove from cluster name