Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Table layout with color coding
Repair broken table
Add sort function and add Bank code column