savetabs branch merged manually and few features implemented