Updated comments
Added theme module frame
Updated table functionality