Develop

Minor layout adjustments and parse library update