Fixing caption display glitch and returning bar button items