Polish design, add missing data.

Should look like this now: http://i.imgur.com/jH2gg7a.jpg