Update/Insert working UI needs attention