Abstract: Edge functionalization of graphene nanoribbons with nitrogen atoms for various adatom configurations at armchair and zigzag edges are investigated. We provide comprehensive information on the electronic and magnetic properties and investigate the stability of the various systems. Two types of rippling of the nanoribbons, namely edge and bulk rippling depending on the sign of edge stress induced at the edge, are found. They are found to play the decisive role for the stability of the structures. We also propose a type of edge decoration in which every third nitrogen adatom at the zigzag edges is replaced by an oxygen atom. In this way, the electron count is compatible with a full aromatic structure, leading to additional stability and a disappearance of magnetism that is usually associated with zigzag nanoribbons.