Fix toolbar and remove default transition