refactored right panel a bit.