layout reorganization implemented