Tweak layout and add more meta information