Updated sidebar behaviour