Some tweaks to layout and generating a parsed combo