Cleaned up more info, complete order buttons