Parser modification and Gui improvement