Some UI adjustment
Moved the parsing part to a different class