adding widget support and moving tables to an external file