Fixed up some bugs with overlays (leaving state)
Separate container class started
Fixed shared content trouble