#123 Added logic in add/remove functions to keep a left/right fragment