Add icon support, column based layout