Stop flickering and change checkbox/label order