Fix graphical issue and auto insert fields