Added Parse Config, improved UI

updated from Master