#19747 Functional, layout changes, fix bugs