Minor changes.

Refactored rightPanel.