rework right sidebar