Added an extra row in the layout, plus added a check for the Application Router