Bepo layout modification