cleanup, use new tabs in contact view