Add features to extension tabs and clode cleanup