Improvements on right panel