Building proper parse page
Updated parser