re do my work which I only pushed up to dev
updated some methods for view container functions/tableview
changes in the bet containerView
Merge branch 'dev' into dans