Changed table structure and associated functions
Merge remote-tracking branch 'origin/combine_ui_bt' into combine_ui_bt