Added OrderFragment and cleaned a bit