Cleaned up container class; fix for hotspot menu