More features added to main container and some corrections