Fix Clock & Date FC and reorder