Hopefully fixed some more label bugs

Hopefully fixed the bugs with the labels painting over each other, but
we'll need to test on the actual device. Commented and cleaned up some
more code too