fix container view in case of new container
close #30 and #31