table layout fixed
Merge remote-tracking branch 'origin/layout-fix' into development