Changed parsing order again. Improved the ui a little more