CF-202 Update edit tabbed layout