Improved Contexts tab