Adds logic for hiding order items
Makes number cycle works (and adds proper tests)
Merges commits