diff --git a/src/components/chart/ChartOrder.vue b/src/components/chart/ChartOrder.vue
index e942d2a..d3ac233 100644
--- a/src/components/chart/ChartOrder.vue
+++ b/src/components/chart/ChartOrder.vue
@@ -17,7 +17,7 @@
         </template>
         <template #prepend-inner>
           <v-btn variant="text" text="max" class="px-0" size="small"
-                 :disabled="!maxAmount" @click="setMax"/>
+                 :disabled="!maxAmount || order.amountIsTokenA===order.buy && !co.price" @click="setMax"/>
         </template>
         <template #append-inner>
           <v-btn :text="order.amountIsTokenA?co.baseToken.s:co.quoteToken.s+' worth'"
diff --git a/src/components/chart/LimitBuilder.vue b/src/components/chart/LimitBuilder.vue
index 6fcaa16..0d0b4a6 100644
--- a/src/components/chart/LimitBuilder.vue
+++ b/src/components/chart/LimitBuilder.vue
@@ -23,11 +23,11 @@
                         :color="color" :base-color="color"
                         style="flex: 6em"
             /></td>
-            <td class="weight">{{(weights[weights.length-1]*100).toFixed(1)}}%</td>
+            <td class="weight">{{allocationText(weights[weights.length-1])}}</td>
           </tr>
           <tr v-for="num in rungs-2" class="ml-5">
             <td class="pl-5">{{prices[prices.length-1-num]}}</td>
-            <td class="weight">{{(weights[prices.length-1-num]*100).toFixed(1)}}%</td>
+            <td class="weight">{{allocationText(weights[prices.length-1-num])}}</td>
           </tr>
         </template>
         <tr>
@@ -37,7 +37,7 @@
                         :color="color" :base-color="color"
                         style="flex: 6em"
           /></td>
-          <td class="weight">{{weights.length?(weights[0]*100).toFixed(1):''}}%</td>
+          <td class="weight">{{weights.length?allocationText(weights[0]):''}}</td>
         </tr>
         </tbody>
       </table>