Tidy up leader toolbar and prevent user from changing selection