Better UI and correct parsing