Currently we have 2 different implementations for the right side panel. This story should unify them into a single implementation.

There may be follow on stories to restore full feature parity with both previous implementations.