Add table support and use javascript for icons