Added IContainer, Renderable and started fixing Modal