Some improvement on Context and fixes rendering