Context panel implemented
Merge branch 'temp'