Fixed some right bar button bugs.