Adding helm and modifying behaviour for killing buffer