Added view order functionality