added context menu, dynamic loading,