Matt: changing UI to use table instead of UL