Add back main container and main panel container