Fried Jelly beans
Added icons and better layouting
Merge branch 'dashboard' into contact