Improvements for the "Context" tab