Removing dependency for short tags
rejigging layout
rejigging layout
Adding support for realname names