Added lots of graphics and Facebook button
Fixed merge problem