V5.9.6.2.3 Offline check removal, resorted buttons