Adding icons, reformating.