fix height calc
rearranging