merged table
updated controls
17 files changed