Edit for flash, better layouts, add table contents