improved layout parser (it should work better now)