Fix ordering back to j3.0
fixed some style looks