Switch labels (null again), some tweaking