Finish work on tabs