improved delegate layout