new design
fixed grid problems
new diagram