Reorganization and display improvements