Order_info style updates, some refact