Changed labels, trying to fix tab order

Tab order is still fucked though, oh well