Design and fixes

There are images added and some problems with Pair entities have been
solved