Fix parser sort bug
Fix UI button overlap bug