Fixed an issue with the toolbar not updating correctly.

Also removed Nicklist for PMs.