various design fixes
Merge origin/master
Merge origin/master
various design fixes
Merge origin/master
various design fixes
Fix table design
fix navigation