Added bag button, minor changes