Fix position and remove container