add more information to layout
fix quotes