User delete fixed and button grouping improved