added popover on the restaurant links and some refactoring