added gridcontainer
minor fixes