More icons, text clean up