Reorganization and styling