Fixed lag on opening switcher, added new features