Little clean-up
Proper display of single entry
Entry friendly id