Adds genericons, plays around with layout a bit