Sorted out toolbar and fixed issue in form-reference reader