Fix parsing layout bug, update help