Fixed order admin issues, closes #342