Little code tune-up and move WAN icons to right side