Added nicer edge highlighting. And tables