rdbaker: Refactored and rewrote the toolbar view. Need to test.