Added fix for spherical layout not working, added fix for context menu